<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>

<body>
    <h2>在master里面修改</h2>
    <h2>在冲突里修改了</h2>
    我诅咒我的室友明天就被泥头车创死
    最好是创死二十次
</body>

</html>